Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 08:02:46 +0000 (00:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 08:02:46 +0000 (00:02 -0800)

Trivial merge